Fix a typo

svn path=/trunk/; revision=17864

diff --git a/ChangeLog b/ChangeLog
index 5fee42cbf88744a0c0084cc70dc3834aef3a7f77..7a24b1dae6e7d99514934e6e0a16bf39c769abed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_transient_for): Fix
+       doc typo.  (#438100, Vincent Untz)
+
 2007-05-18  Michael J. Chudobiak  <mjc@cvs.gnome.org>
 
        * INSTALL.in:
@@ -83,6 +88,7 @@
        #425138 (Reported by Michail Crayson). Some code simplifications.
        (gtk_notebook_draw_arrow): code style fix.
 
+>>>>>>> .r17863
 2007-05-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpathbar.c: Add ATK names to the Up, Down, and Root

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a7140aafbbce21cb74fab5e0cfa284cc17a765a6..b1943d7ec8c56ee6f6dbe22906825f0175d54290 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2029,9 +2029,8 @@ gtk_window_unset_transient_for  (GtkWindow *window)
  * functions in GTK+ will sometimes call
  * gtk_window_set_transient_for() on your behalf.
  *
- * On Windows, this function will and put the child window
- * on top of the parent, much as the window manager would have
- * done on X.
+ * On Windows, this function puts the child window on top of the parent, 
+ * much as the window manager would have done on X.
  * 
  **/
 void